Resolve CVS conflicts

diff --git a/src/fringe.c b/src/fringe.c
index 6bf35d73d627ab12b20379c656fd4ad937bd101c..f6028d44dc8e94e80c87ae48ed051f4c5921571f 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1316,3 +1316,5 @@ w32_reset_fringes ()
 
 #endif /* HAVE_WINDOW_SYSTEM */
 
+/* arch-tag: 04596920-43eb-473d-b319-82712338162d
+   (do not change this comment) */